Add support for container prefix