Improve DelegateCFState