Added setup functionality