1) Changed keys to generic