Start refactoring prospector client