Update to library use only when available