Removing assumption in file extension