Refactored EI and RRSP