Moved format methods from tenant api to methods belonging to the individual classes