Added slightly more intelligent user sessions.