making the keys more generic