Reworked data heirarchy.