Changed the name of a property in Channel and User
Added server parameter to some methods
Rewrote server data handling