Make database more isolated