Add ns for namespace
Completed generator