Resolved the issues with multiple templates