WIP: get AAE working with bucket types