Updated helper
Moved TDS requirements to when theyre actually reuqired
Merge branch 'release/1.1.0'