Switched over to an Entity-Component system. Components may be attached to an Entity by name (subclass and specify components if you want).