Changed getContainer method