Container Exists implementation and some minor changes