more db modularity