Add more CF API methods

Change-Id: I539266bcd8567ef8f98f7fc77c683d66403abab5