Added server setup