[899753] Part 1: Added support for Map and Set