New version of groovy templates