This is a breaking change, we don't want to introduce breaking changes until 2.0 release