Some changes on json :)