added option use custom server name as well