All existing methods were already using the constructor... Should we better change them all?