Added support for stage containers