Added container limit checks