Fix some issues related to AE's maps and add parameters for AE