Remove containerMap type
Improve documentation