Add method stuff
Fix use of `super`
Build fixes
API updates