Fix namespaces, added context.