- Simple DB implementation works fine now