Update keywords and USE flag