Added more index's