Remodel billing agreement migr + model