Changed to JsonBuilder and JsonSlurper for serialization/deserialization