Added setup and server