Add support for tooling, db types, component services