Added CXF