Add session handling for HomeID