refactoring / fix up for DatabaseConnectionResource