Support for 1.1 changes