Made hierarchy an option and defaults to false