Key-value pairs now passed properly