Implemented enum handling