Need to preserve constructor for non API breakage