Modified Messages and StartSuccess templates