Added auto-functionality to SNI.