Implemented add/replace protocol