Improve rate accounting