Updated several annotations related to configuration parameters