Modified Database Class