Annotated HostSite model
Added spec for QueryService