Updated with new keys