Added a type to the returned objects.