Updated whole project to use json