Updated for supported formats