Extracted EnhancedObject into its own file