create return entity and refactor borrow entity