Added shim for legacy libraries