Refactor into filled model class