Performance improvements to catch up with Gson