add AAI etc mapping to master