refactoring and allowing WFTDA 7 update