WIP - Fix name issue and missing inheritance