Fixed class heirarchy