Add configuration from properties and system variables