Add Flags support