Updates for hybris