Non-breaking changes to be added after the release of v2.0