More work
Annotating what will require Nova-API extensions