Updated constructors