Making container aware