Update work model to include position title. Some refactoring