Added extra server functionality