[Utils] Fix, enhance and use EnumSet