Adding support for embedded resources