Add a new when module and required ndp lib