Compatibility with new companion