Configuration is simpler now