Improved compatibility