#6 #7 Price mapping manager creation and little code refactor