Flags updated to be booleans