Added support for extra templates