Fixed configuration persistence
Additional configuration options