Added more fields to User that I missed when writing them originally
Formatting commit for imports