Add remaining columns to User model
Add associations to current models