Complete re-work of I18n RecordMappers and collections