Add support for Contianer in Environment