Refactored DatabaseAdapters