Considering also annidated classes