Updated to new SDHLibary