Updated delegation server to use RMI in a more managable way