Added indexes, changed floats to decimals