Adding cf stuff