Models

PR for code review 
Can you add unique constraint here as well?