Added command lists and short keywords