Updated base hierarchy