adding support for plain values instead of only arrays of keys