Replaced arrays and its count by vectors of enums