Updated according to latest JSON format