Prepare some changes to allow sharedlists