Drop in existing tool functionality