Added session selection mechanism