Update JSON parsing functionality
Small updates