Refactor and add expanded method in request and session