Solve breaking changes