Refactoring
Changes due to EventQuery being removed