Use namespaces and other changes