Make the container a little more generic to allow downstream containers
easier to maintain.