Fix for containers value data types, now const