Rewrite parts on tooling to be more generic