Refactor Advertisements to prepare custom discovery