Implementing wave 8 and AoT