Refactoring: createTemplate() moved from factory to Message, template is now created lazily, only when template is accessed
Coding standards: Fix annotations according to namespaces in use statement