Added container aware interface