Feature/certh changes