Added some server architecture