Bring annotator redis code in aligment with main project