Major changes on infra