More work on CXF plugin