Refactoring of DW-based service, to try to eliminate hard-coded PathType in near future