Generalize flags types
6 files changed