Created support for non-default index names