Refactoring : change object map