Updated to include those as well (as well as other symbolic keys)