Added support to RMI server/client