Integrated the xcms picker