Add update, remove and removeAll apis