Adding more fields and correcting enums to use correct singular or plural nouns.