Make load_package simpler