Added setup support