Add watchers info
Add Borrow logic