improve CDI - cxf