RMI improvement