Issue 37

Add custom fields from User model