Added formatter class