Updated infra design