WIP v21 + v7 support