[ca] Improved rules