Feature/make work index