rewamped structure of values, added list support