ResourceServer added (vNext)