Added support for embedded resources