Added CFI, still need to map pins