Fixed Database Code <-> DatabaseHelper