Add support for ACRs in registrar and subscription modules