Removing need to subclass