Updated namespaces and paths