I think so. That would also solve the AR inclusion issue I think. (I was trying to stick as closely as possible to how the existing  adapters are implemented.)