Added hierarchy
Second problem solved