added keywords management