Update to constructors