Added hostname and name fields