Updating @Optional annotations