This is a self maintaining method, I'm not sure what the advantage is to moving it to the billing manager