Constructors updated