updated to include new Rubicon modules
updated db names