Serious refactoring of crawler!