Made the FormatWrapper more flexible