Added some infrastructure design thoughts