Added functionality of namespaces