Refactoring pimp my bar to work with model refactor