Refactored the instance attribute design to remove extra generic type definitions and more logically use base-class properties.