Constructors adjusted