Add reflection entity handling, support hierarchy.