Added message support to base template