Added setup utility