Breaking Changesedit

There are a number of breaking changes when going from 1.x to 2.x