Added delegates and namespaces.