Library updates for easier import.