Must add new constructor and deprecate old