Added Events class and handler