Added preparations for extended search. This references #7