Add some magic fuer multiple DB support