Added formatting options