Fixed support for default containers