Improved interface, added containers dep.