Support for HFE analysis added (Matthias)