Breaking changes while upgrading to 0.90.1