Crawler and Parser refactored