Add support for non-optimistic search