removed events for now and renamed service request objects