Added more types to ObjectType