Improve hierarchy