Updated dependencies, namespace changes