Added server draft code