Updated fields to match the class diagram