Some improvement of hierarchy parsing
Improving competability with interfaces