refactoring
add session and message_id