Some further work on cxf integration