Update loadDatabase behavior