Factory refactoring (removed mapping wich wasn't used)