More work on cluster event engine