 	
 	:returns: A future that resolves to the fetched resource.
 	*/
-	public func findOne<T: Resource>(query: Query<T>) -> Future<(resource: T, meta: [String: AnyObject]?, jsonapi: [String: AnyObject]?), NSError> {
-		let promise = Promise<(resource: T, meta: [String: AnyObject]?, jsonapi: [String: AnyObject]?), NSError>()
+	public func findOne<T: Resource>(query: Query<T>) -> Future<(resource: T, meta: Metadata?, jsonapi: JSONAPIData?), NSError> {
+		let promise = Promise<(resource: T, meta: Metadata?, jsonapi: JSONAPIData?), NSError>()
 		
 		let operation = FetchOperation(query: query, spine: self)
 		

	
	:returns: A future that resolves to a ResourceCollection that contains the fetched resources.
	*/
	public func find<T: Resource>(query: Query<T>) -> Future<(resources: ResourceCollection, meta: [String: AnyObject]?, jsonapi: [String: AnyObject]?), NSError> {
		let promise = Promise<(resources: ResourceCollection, meta: [String: AnyObject]?, jsonapi: [String: AnyObject]?), NSError>()
		
		let operation = FetchOperation(query: query, spine: self)
		

	
	:returns: A future that resolves to a ResourceCollection that contains the fetched resources.
	*/
	public func findAll<T: Resource>(type: T.Type) -> Future<(resources: ResourceCollection, meta: Metadata?, jsonapi: JSONAPIData?), NSError> {
		let query = Query(resourceType: type)
		return find(query)
	}
