Infrastructure updates and improvements