Override default implementation to add NHDD mapping
Override default implementation to add NHDD mapping