Added back the toolkit parts.