Better package guessing :p