Add defined split package handling