Added a feature for adding key/values too