Added some generators and gave them a namespace