Close #55: Marked the optional fields