Clarified object types