Changed json handling