Added server RMI support. Part 2