Added setup to run on bootstrap