Updated Haneke integration with metrics