these changes should go in a separate PR
ensure ObjectType is set