CFX support added