Add proper fee parsing