Added event service
Replaced done with exec