Compatibility for older versions