Models

PR for code review 
I think you can use `type: :model` here. Same for the below if it works.