Added hierarchy window & system