Changed search-related models into a single object