Modified constructors for further development