Model changes

Updates according to https://trello.com/b/ERa3TxtQ/hq-accounting-roadmap-weekly