Updated to use namespaces.