Make compatible with search