Added namespaces to generators