HWCF updates