Add partial for domains + refactor crawler a bit