Refactored settings into request