refactors and unification to the wsu ext model