DB Abstraction Changes