Changes for design and template integrations