Adapted Namespaces
merged