Fixed inherent hierarchy issues