Add keys/values functions to output