DFW-LSC refactor