Attempted fix of class hierarchy