Add Update()
Fix controller
Dummy wake() methods for Controller
Merge branch 'wd-parser'
Fix Controller