Updated keys to standardize . convention