Added more xcms functionality