Switched namespaced classes to use Core::make instead