Mapper and reference refactoring
Add reworked NoRef