Add container to type list

An ideal solution would allow us to include types in a pluggable
fashion for EC, but this will do for now.