Add the ability to turn off adding metric suffixes

Add the ability to turn off adding metric suffixes #699