EnumSet instead of List
Renaming, cosmetic changes