Remodel billing agr, model + migration