Adding better descriptions and keys