#23 DBAFactory refactoring