Add iRec and general refactor