Feature/add index