Update some parameters and annotation

Update some parameters and annotation