Added base server selection