Anorm refactoring