Update usage for the new constructors