Add support for specifying/retrieving the embedded filename