Added indexes and auto_increment support