Improve initial data base