update the data package strategy, update error handling