Added container capability enabled CFG support