Added session_id support.