Improvements on the billing command