Converted to new namespaces and changed a few things around