mainly DBInt refactoring