Added the base type-to-value container