updated more db integration