Add additional configuration options

Preparation for additional configuration settings