Update Drop and Add tools after mapping review