Move to using hyperquest