Added server and router