ResourceId renamed to Resource