Add search and importing