Expanded class hierarchy of Issue523