Make host a stored resource

Change-Id: I756c6389198365c2c85b5949bb1001015e34c152