Add rename class
Use the new Formatter