Added JSON Keys and Date Format