Added some infrastructure changes