added caf support