updating namespaces, adding some functionality