Added setup tools