yet another refactoring on beta dlls