refactoring JSFP and DSAN