Extracted AA compatibility code to the module.