Added search and dump modules