Updated to use event-client:1.6.4