Refactored DatabaseInterface