Updated factories to process settings the same way as helpers