Add refactored ndel command and UT