Migrate to org.json
Added Map with string values serialization