#136 move away Container constructor dependency