Added the schema options for AAE
Merge branch 'aae' into fifo