migrate to xtract package