REV: Added class container.