EventServicePOC modified