Added option to use the Math container.