Added Trinity and for some existing tools added enums where there were string selection parameters.