Added setup methods