Added more Client and Server Features