More clearity, changed RMI interfaces #6 #9