Add containers

Need to tweak code coverage for containers.