add. remove functionality.

Change-Id: I59779882310708f7c1e31c5238a1848fe522ed62
add. update functionality.

Change-Id: I289045a03f4f6b886ed0053f6d1ffeb7dcb01c1b