Use references to keys instead of hard-coded keys 2