Updated some code + Json files