Added more standards for CFS