Change flag to optional character, add name field for flags