Modified constructors. Add set methods