Updated Templates implementation