I think we should keep BC and improve the adapter for the next major release.