Add support for case objects value hierarchies
Tweak support of case objects