Update some keywords and use flags