Improve package lookup