1. Modified CharacterUnit so optional fields can be null in database.