Change configuration for more flexibility