Added ObjectType calls.
Added missing MetadataSchema calls.