Added format class