RMI main method changes