Add preliminary extended searching