Support for new AAI certificate