Added format selection