GetEvents refactoring