Feature/indexing separate sender#85

#85