Added second class into hierarchy, FillIn by Longfei