Restore old Engine API, but with variant