Added option for JSON parsing