Constructors modifications