Refactor impressions as well