Moved to Scala 2.11.1, removed JSONObject