Feature/index implementaition