Adjusted KVP set and get methods so they should work properly now