Added CFH support to API.