Adjusted server functionality