Added combined server file