Optimisation done, support for big databases