More work on External tools