Modified HalResponseEntityBuilder