Put annotation back to support incrementality