better keywords support