Make BaseContainer more configurable, add some error checking
Version update