Removed requirement for search module to exists