Replaced modules with ns_core modules instead