Added AbstractContainer
Fixes