Changed R2N and server connections functions as well as server class