added optional fields to be configured