Changed keys to uppercase