[WIP] Add new AAI configuration files