Changed json library & updates