Fee calculation update