Template refinement, added single message template