mapping informations refactoring