Updated unit & entity heirarchy