Modify for AOSPA-legacy