Added namespaces and annotations.