             @current_user = null
             @request @uris.authentication,
                 success: (r) =>
-                    if r.authenticated
-                        @current_user = r.user
+                    if r.authentication.authenticated
+                        @current_user = r.authentication.user
                         success?()
                     else
                         error? 'authentication_error',

            uri = @uris.data_sources
            if options.filter == 'own'
                uri += "?user=#{ encodeURIComponent @current_user?.uri }"
            @collection uri, options

        create_data_source: (options={}) =>
            success = options.success

            @request @root,
                error: error
                success: (r) =>
                    if r.root.status != 'ok'
                        error? 'response_error', 'Unexpected response from server'
                        return
                    @uris =
                        root: @root
                        authentication: r.root.authentication.uri
                        genome: r.root.genome.uri
                        annotations: r.root.annotation_collection.uri
                        coverages: r.root.coverage_collection.uri
                        data_sources: r.root.data_source_collection.uri
                        samples: r.root.sample_collection.uri
                        tokens: r.root.token_collection.uri
                        users: r.root.user_collection.uri
                        variants: r.root.variant_collection.uri
                        variations: r.root.variation_collection.uri
                    success?()

        annotation: (uri, options={}) =>
