More changes to make backwards compatible