Improved filename arguments