Added support for the latest heimdall