Adding enum support in State and Event name eqaulities