174 - Changed for the enums introduced