Accomodate Yi package split