Few updates on the infra side