Improved rules integration.