Added Index-path to cases, working with template