Add in yes/no index support & much else