Using latest version: better numeric key values and better proper casing