Add enforcement for object types