Annotated models
Added finder methods for email
Merge branch 'refactoring-setup' into refactoring

* refactoring-setup:
  Added finder methods for email
  Annotated models