Introduce container trait
Improve type-safety of container classes