[INTERNAL] Add additional keywords