New configuration logic