Added container & initialization abstractions