Improve keywords management and configuration checks.