Use class hierarchy from latest 4.6-dev core.