Added server selection feature