Slight changes to how host and resource is used