Change advert handler to cv handler