added new base structure for new search functionality