Added classes for the verb and shell keys
Added a couple of (undocumented?) properties