Fix ouput key data as well, and add month key.