[OSJC-76] replacing enum with class