Adjusting to support multiple formats