Added WFI prefix to classes