Improved rules deployment