Added templates and ZCML includes