Add ContainerParser class
Add container helpers