Adding support for unbundled resources