Added auto commit and option for including everything