Refactor extract function

webRepositoryHandler
webDomainHandler