Tons of ObjectMapper improvements