OPAL-2270 - removed enums and added exceptions instead