Continuing converting to use annotations