Fixed library integration