More refactoring into loader/mapper/model pattern