More flexible format handling