Update for formatter changes