Support for embed endpoints