Update for fmt changes