Moved to module architecture
Next and prev search methods