Internal Tools additions for dev