Add embedded tool options: WIP