Update for ToStr removal