Added indexes mostly