much more db integration