- Moved hierarchy support from active record to service