Added more Server functionality