Improved library integration.