Memory consumption reduction WIP