Updated scrapes and factory code for defineing types of scrapes