Add support for embedded covers