No longer use deprecated generators.
Merge pull request #108 from cmeiklejohn/bugfix/csm/remove-deprecation-warnings

No longer use deprecated generators.