Separated configuration logic