Add position model, refactoring