Added namespaces in generators