Improve billing accuracy

Improve billing accuracy