Added key/val refs
Small tweak