Updated rates calculation functionality