Slight schema changes and some models
Schema changes and basic user data