Updated JSON functionality