Added resources coming from and going to the server
Fixed stuff