WIP: Additional configuration options