Adapt for AOSPA