Compatibility with api2