Added namespaces for scenarios