Made the Json creation a bit more groovy.