Added multiple system selection