Convert Dashboard to new AA API