Fixed issues with new containers not being registered correctly