Added flags and a map