Adding handling for multiple formats