Added the ability to specify container class