Database now injectable