You are right, I will need to refactor new container a bit.