Refactored crawler