Moved the database activity into the database package