Refine session management