Restructuring Tours class to fix this issues