Modified constructors