FS-24 Changes for the program to work with the server connector