Added critical indices as well as enhanced index generation