- Add rules
- Performance improvements