Updated infra and other details