This got complicated, but I think full system is in place, and better to think about this before 2.0 is out then after.
Please see latest release: