Updated namespaces inclusion