Added Proxy Container and fixed some other issues