Update JSON returned, performance and quality optimized