added namespaces (core, internal)