Added search, need some checks