Add rmi support