Add constructor support