My suggestion was to still use a single class, but with two instances - one for regular state transfer, the other for x-site state transfer.