Added option to force keyword updates