Updated and tested DatabaseHelper class