Added constructor support