Added Indexing and templating capabilities