Templates improved, index enforced