Added server RMI support