[tornado mode] Add new keywords and organized the list.