Improved compatibility in metrics calculations and added float suffixes when needed