Feature/46 improve price management