Adapt for AOSPA #2