Add library and server modifications