Added the base and index to template