Fixed performance problems caused by json parsing