Added templates and new coldef options