Added the schema options for AAE