Updated to search for correct package types