Working on decoupling chat & Fix for update overwriting mapping in index