Updated ContainerWrapper to add quotes