Made a couple of new additions for larger databases