Moved search to new module