add keywords support