Renamed EventDictionary, converted to non-static class