Make-over to make it multi-database