Small fix
Single message stored instead of a collection of messages
Fix zone sharing issues and prechecks
Tests covering the directive