DB Security Manager refactoring