Table structure changes and Billing Logic changes