Compatibility with older versions