Added defaults for backward compatibility.