Overhaul of the local package support