Added basic event-only capabilities (rather than using callback)