Added User based model classes.
Merge branch 'ThomasBranch'