Added network search support