Server minimal changes