Constructors have been updated