Added the new formatters and made it work with updated functions.