Task #123 hosts

Change-Id: I2521f93d1443c87b01d00548d43d6c417ef1703b