More work on containers