Methods stuff works as well as can be expected for now
Support for optional datastreams
Merge remote-tracking branch 'origin/master'