WIP Do not merge - Restrict hierarchy to types