Adding support for external assets