Added some new container types