simplify and split into Map and List data types