Use of boxed types as started in 009d4ca445 is finalized here to enable storing data in a map. MapClientEntity methods are reordered for the sake of grouping the collection-based properties together and understanding the connections between those.
009d4ca445
