Adding support for GSP templates