group by Database type and not by Functionality
add new namespace layer