Updated template related references