Updated export templates and messages