Add content-hub support