Finish refactoring of AdsModel