Add session id property
Change emit data