Refactor/move defaults to models