Work on CxF object model