Implemented NBIA-421 Better shared list management