Updated Case and Formula to start use the generic Container Map