Handle mem refactor