Initial efforts to port to DBAdmin module