Initial server modifications