Added support for compartments.
Added support for compartments.