Extend default NS classes