CompositionBatch added, CompositionContainer enhanced