Improved compatibility with third-party modules