Cxf implementation and other minor changes.