Updated: use stable package if available