Some minor changes to the implementation of the database helper